Skip to content
This repository has been archived by the owner on Jul 1, 2022. It is now read-only.

Update to Apache License v. 2 #262

Merged
merged 4 commits into from
Oct 9, 2017
Merged

Update to Apache License v. 2 #262

merged 4 commits into from
Oct 9, 2017

Conversation

yurishkuro
Copy link
Member

@yurishkuro yurishkuro commented Oct 8, 2017

Resolves #239

  • replace headers
  • add LICENSE, DCO, CONTRIBUTING.md
  • set default copyright to The Jaeger Authors for new files

Signed-off-by: Yuri Shkuro ys@uber.com

@ghost ghost assigned yurishkuro Oct 8, 2017
@ghost ghost added the review label Oct 8, 2017
CONTRIBUTING.md Outdated

We gratefully welcome improvements to documentation as well as to code.

# Certificate of Origin
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this header need to be here? If you want to have a discussion of DCO before the details nearer the end, then possibly don't have the header - or else make it level 2?

@@ -1,23 +1,15 @@
/*
* Copyright (c) 2016, Uber Technologies, Inc
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be 2017? We can't apply the license retroactively, can we?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing the licensing terms does not change the copyright. There are only two files I corrected in this PR that had incorrect 2017 copyright, even though the files were written in 2016, so I changed them to 2016-2017.

Yuri Shkuro added 4 commits October 9, 2017 12:08
* replace headers
* add LICENSE, DCO, CONTRIBUTING.md
* set default copyright to The Jaeger Authors for new files

Signed-off-by: Yuri Shkuro <ys@uber.com>
Signed-off-by: Yuri Shkuro <ys@uber.com>
Signed-off-by: Yuri Shkuro <ys@uber.com>
Signed-off-by: Yuri Shkuro <ys@uber.com>
@codecov
Copy link

codecov bot commented Oct 9, 2017

Codecov Report

Merging #262 into master will increase coverage by 0.29%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##             master    #262      +/-   ##
===========================================
+ Coverage      82.3%   82.6%   +0.29%     
  Complexity      530     530              
===========================================
  Files            87      87              
  Lines          2006    2006              
  Branches        237     237              
===========================================
+ Hits           1651    1657       +6     
+ Misses          258     252       -6     
  Partials         97      97
Impacted Files Coverage Δ Complexity Δ
...in/java/com/uber/jaeger/samplers/ConstSampler.java 60% <ø> (ø) 3 <0> (ø) ⬇️
...rc/main/java/com/uber/jaeger/context/Runnable.java 92.3% <ø> (ø) 5 <0> (ø) ⬇️
...xceptions/MalformedTracerStateStringException.java 100% <ø> (ø) 1 <0> (ø) ⬇️
...er/jaeger/filters/jaxrs2/ServerRequestCarrier.java 85% <ø> (ø) 2 <0> (ø) ⬇️
...java/com/uber/jaeger/propagation/PrefixedKeys.java 100% <ø> (ø) 3 <0> (ø) ⬇️
...r/jaeger/samplers/GuaranteedThroughputSampler.java 88.88% <ø> (ø) 7 <0> (ø) ⬇️
...reporters/protocols/JaegerThriftSpanConverter.java 92.06% <ø> (ø) 21 <0> (ø) ⬇️
...m/uber/jaeger/dropwizard/SamplerConfiguration.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...java/com/uber/jaeger/reporters/RemoteReporter.java 90% <ø> (+2.85%) 9 <0> (ø) ⬇️
...java/com/uber/jaeger/propagation/TextMapCodec.java 92.64% <ø> (ø) 19 <0> (ø) ⬇️
... and 80 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4546b8b...fca8ece. Read the comment docs.

@yurishkuro yurishkuro merged commit 9416234 into master Oct 9, 2017
@ghost ghost removed the review label Oct 9, 2017
@yurishkuro yurishkuro deleted the apache-license branch December 23, 2017 21:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants